Merge changes Icafa2067,Ie8c0bc40 into studio-1.3-dev * changes: Code cleanup, removed warnings and removed potential NPEs. Minor cleanup of test code.